Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 11 May 2010 04:09:05 +0000 (04:09 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 11 May 2010 04:09:05 +0000 (04:09 +0000)

Trivial merge